Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 24 Nov 2005 19:57:01 +0000 (19:57 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 24 Nov 2005 19:57:01 +0000 (19:57 +0000)

Trivial merge